From: jave <joakim@verona.se>
Date: Sun, 28 Dec 2014 16:33:38 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=703cbed72f82633cf3720ce8ad0523ea3af2c9f5;p=emacs.git

Merge branch 'master' into xwidget
---

703cbed72f82633cf3720ce8ad0523ea3af2c9f5